]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
panel: Keep prefs in sync with shell-shows-app-menu state
authorJonas Ådahl <jadahl@gmail.com>
Thu, 23 Aug 2018 13:56:50 +0000 (15:56 +0200)
committerFlorian Müllner <florian.muellner@gmail.com>
Tue, 28 Aug 2018 23:53:10 +0000 (23:53 +0000)
Previously mutter listened to Xsettings (via GTK) to get notified
whether the shell showed the app menu. After X11 support was changed in
the direction of being less central, listening to this particular
Xsettings were removed with the intention of having the Shell tell
mutter directly whether it was showing the menu or not.

This commit makes that happen. It still travels through Xsettings (still
via Gtk), as the shell still gets that state from Xsettings, but fixing
this is out of scope for this particular fix.

Closes: https://gitlab.gnome.org/GNOME/mutter/issues/276
js/ui/panel.js

index 4fd599c47b604fca232ba343ecc4a282a542eabb..3726b844509b02f0f5218a3f7cce5d82456ff379 100644 (file)
@@ -307,8 +307,11 @@ var AppMenuButton = new Lang.Class({
             }
         }
 
+        let shellShowsAppMenu = this._gtkSettings.gtk_shell_shows_app_menu;
+        Meta.prefs_set_show_fallback_app_menu(!shellShowsAppMenu);
+
         let visible = (this._targetApp != null &&
-                       this._gtkSettings.gtk_shell_shows_app_menu &&
+                       shellShowsAppMenu &&
                        !Main.overview.visibleTarget);
         if (visible)
             this.show();